Merge branch 'master' into routelist
authortsteven4 <tsteven4@gmail.com>
Wed, 27 Feb 2019 15:33:48 +0000 (08:33 -0700)
committertsteven4 <tsteven4@gmail.com>
Wed, 27 Feb 2019 15:33:48 +0000 (08:33 -0700)
commitefbfbec5a24784d7973505b1936353389a4c154f
tree3b3fa57994b1eee2afd44428eb7db275be419995
parent748132f3022c3fb767b6bf8f2405730a53407e0c
parent08610fc1107661009dc628a61a8d622d2143a2f5
Merge branch 'master' into routelist

including manual resolution of conflict in main.cc.
defs.h
main.cc